Install backend specific header (bug #405915). Also add a getter for the

2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/Makefile.am:
	* gdk/quartz/gdkquartz.h:
	* gdk/quartz/gdkwindow-quartz.c: Install backend specific
	header (bug #405915). Also add a getter for the toplevel nswindow.

svn path=/trunk/; revision=19151

diff --git a/ChangeLog b/ChangeLog
index 0e3d5afa02d79fa902285687f89c2e3dd28f07ca..d9723ea36e34b6cc1fa052920608a0c3419f8acd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-10  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/Makefile.am:
+       * gdk/quartz/gdkquartz.h:
+       * gdk/quartz/gdkwindow-quartz.c: Install backend specific
+       header (bug #405915). Also add a getter for the toplevel nswindow.
+
 2007-12-10  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkdrawable-quartz.c:

diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 6643d2b0eb5634abc91028da3f3b3c7c93e16166..bbf7db58f8051b8766a9c19ec6ec574dd442bb38 100644 (file)
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -52,3 +52,7 @@ libgdk_quartz_la_SOURCES =            \
        gdkwindow-quartz.c      \
        gdkwindow-quartz.h      \
        xcursors.h
+
+libgdkinclude_HEADERS =        \
+       gdkquartz.h
+

diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 84a04c9724f0101db090b968cb36ab24a8e85e9f..0e6b5cf7543f14077289627dac9158949c5d1e2c 100644 (file)
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -26,6 +26,7 @@
 
 G_BEGIN_DECLS
 
+NSWindow*gdk_quartz_window_get_nswindow                        (GdkWindow      *window);
 NSView  *gdk_quartz_window_get_nsview                          (GdkWindow      *window);
 NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only             (GdkPixbuf      *pixbuf);
 id       gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context);

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 62719e0936a6560f44c60918d91332c6dc227eed..fba383374d0898dbde749ee844d5263e0ab68956 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -44,9 +44,23 @@ gdk_quartz_window_get_nsview (GdkWindow *window)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
 
+  if (GDK_WINDOW_DESTROYED (window))
+    return NULL;
+
   return ((GdkWindowImplQuartz *)private->impl)->view;
 }
 
+NSWindow *
+gdk_quartz_window_get_nswindow (GdkWindow *window)
+{
+  GdkWindowObject *private = (GdkWindowObject *)window;
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return NULL;
+
+  return ((GdkWindowImplQuartz *)private->impl)->toplevel;
+}
+
 static void
 gdk_window_impl_quartz_get_size (GdkDrawable *drawable,
                                 gint        *width,